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