[#864539] Missed to move a change from the thimble module version to this branch version.