Pull in change from HEAD
Pull in change from January to fix build failures.