Merge "Fix the Rubocop offense EmptyLinesAroundBody"