SonarShot fix
Things
Merge origin/Friday_Branch into Friday_Branch