Merge 1.2.1 of master repo