Merge "Sonar - technical debt of FRS app" into stable/boron