changes from opening up unity in master