Merge pull request #13619 from aparcar/no-circle