Merge branch 'bug1094_v2'