OSNG-9 - increased rule compliance
Merge remote-tracking branch 'origin/master'