Merge branch 'jc/deprecate-old-syntax-from-merge'