Merge pull request #4722 from alexanderkyte/checked_after