CE-1162 Implementing CR suggestions