[RCD] changeset 2939 made by Till