needed with changeset 14304