Merge branch 'bug27849_redux'