Fixes #4804 adds missing deprecation notices