fixes #338#341

aaron-junot merged 2 commits intoOperationCode:mainOperationCode/resources_api:mainfrom

jtmst:add_order_byjtmst/resources_api:add_order_byCopy head branch name to clipboard