Merge branch 'cipy-master'