* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""