Merge 72_release changes to Nov 12