ready merge master
Merge branch 'move-local-req-to-app'