Merge branch 'bug5070_take2'