Contains Robert's checkstyle changes

Reserved merge conflicts for Robert's merge.