Fixed violations
Merge remote-tracking branch 'origin/148' into 148