Add Local Queue Config
Merge branch 'dev'