Bug/cms 640/test branch