Merge branch 'bug23512-v4-029' into bug23512-v4-032