some changes to the V1.3 branch to test merging to master later