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