Merge changes from 16sep->25sep