Sync 8.0 with pylint fixes from 7.0