[FIX] pylint
Merge remote-tracking branch 'upstream/8.0' into 8.0