CMS7-7679 Replaced logs with TODOs
CMS7-7679 New build