#1058: Support's Apr 9 changes

Change request updated