CODE: Minor style changes
Merge branch '11.x' into devel-new