Code review/refactored version#19

shukebeta wants to merge 4 commits intoSerkoOld:masterSerkoOld/OrderManagement:masterfrom

shukebeta:codeReview/refactored-versionshukebeta/OrderManagement:codeReview/refactored-versionCopy head branch name to clipboard