Delay the removal of deprecated methods that break the build
Merge branch 'master' into bugfix/6156