Fixes #7862 - Upgrade rubocop version