[#63147448] These changes can no longer wait for dev response to submit. Uncommenting these changes.