merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged. brings 2.4 and trunk in sync aside from sequencer edits from Peter.