Merge from master
Correcting more code quality issues