Gii codestyle fixes
Merge pull request #3728 from umneeq/gii-codestyle-fixes

Gii codestyle fixes