Merged 1.2.1 to master