Merge branch 'patch5884'