Fixed bugs related to Update of order items
Merge remote-tracking branch 'origin/master'