Initial work towards rust issue #14926