Merge branch 'Yvonne-revisions'