ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far