Merge branch 'bug30286_2_squashed'