Merge "Fixed a bug where min-priority were in the middle" into oc-dev