CFY-1746 fix branch to master