Merge from upstream
Code style fixes