WIP

related to CAM-1459, CAM-1461