Merge pull request #4712 from alexanderkyte/master-circular-fix