Probably would make sense to pull it out into a separate pull request/jira for 4.0.4