Merge from master
Correcting code quality issues + improvements