Manually merged in version 8.15 of the parent repo.