Merge branch 'patch/namedscratchpads' into v0.6-a/patched-base
regenerate patches
regenerate patch file with