#2108 - Style changes for the last(?) time - Navaneeth