Import Dev1 changes from DevMaster