Fix for coding rules violations
(cherry-picked from 9653b1b)