merged changeset 9273 in the onelab branch