Merge origin/master
Added duplicate order number validation
Merge origin/master