Does not close #3243699, but need to merge this into 1.x-dev in order to get it into the project for client validation.