Issue #2766919 by Manjit.Singh, Yogesh Pawar, naveenvalecha, navneet0693: Coding Standard fixes - Round 3