Sonar: don't expose internal array via getter
Merge branch 'sonar'