Add back error suppressor during upgrade
Use legacy import.
Revert removal of error supressor during upghrade
Fix invalid class name references.
Revert old APIs for the time being
Merge branch '1.3'