Merge branch 'bug24895_031_02' into bug24895_032_02