Merged changes from 1.2/develop