Merged latest trunk changes to ira-select.

From-SVN: r279316