Merge branch 'jc/deprecate'