Fix sonar issue: visibility modifier
Merge branch 'daley', remote-tracking branch 'origin'