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