Deprecated some now-unused methods
Merge remote-tracking branch 'origin/test_implementation' into test_implementation
Merge remote-tracking branch 'origin/test_implementation' into test_implementation