CFY-1360 restore master branch