Merge branch 'jc/merge-bases-paint-fix'