Merge branch 'patch/namedscratchpads' into patched
regenerate patches
regenerate patch file with
update patch with latest changes
create patch file