Address minor sonar violations: modifier order, singular field, redundant modifier
Merge branch 'daley', remote-tracking branch 'origin'