Re #9651. Trying to avoid merge conflict on develop.