code standards
Merge from dev branch