Merge remote-tracking branch 'amarx/10352' into next