Add preprocessor conditionals to handle upcoming deprecations
Merge remote-tracking branch 'origin/R16B01_deprecations'