BRANCH SP-1265:

   resolved conflicts