cherrypick 88fdb85
cherrypick 1901335
 cherry-pick ef727e7
cherrypick bd36369
cherrypick 7c070d7
Fix for dynamic appPath
Fix for appPath
Fixes for appPath
remove hanging comma in package.json