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