More comprehensive controller transition deprecations - Fixes #1785