Refs #9313 style changes
Merge branch 'feature/9313_SmoothNeighbours_new_option' into develop