Merge branch 'bug2338'