Changes to support file upload dialog migration 
Also, these changes were necessary to match work which has occurred in master.