master-merging r1.1