Merge to prep from 1.2.0 merge