Merge "SONAR TD - Sal*ServiceImpl" into stable/boron