TRUNK-2663 Fixed static access sonar issue

(cherry picked from commit be1c036a8463f2a93a12b024f855fc508ee77ff8)