Merge branch 'bug5285_v2'