Merge pull request #4955 from atif-shaikh/master-cleanup