Fix master_tops functionality
Pylint
Merge pull request #13900 from cro/master_tops_fix2

restore master_tops functionality