merged changeset:11572 in trunk