Project: datamanagement
Issue DM-5151: Code review, Feb 2016
DM3733,DM4825
Story points: 2