Merge "Update code style for easier merging" into tm-qpr-dev