These changes have been revived from !61211. Co-Authored-By: Dermot Bradley <dermot_bradley@yahoo.com>