pull request for 4/21