Merge "Fix minor issues regarding checkstyle" into stable/boron