Merge branch 'fix/missing-deprecation' into 'develop'