Merge from dev
Fix for dynamic appPath