Merge "Fixing issue where migration all apps folder couldn't be picked up." into jb-ub-gel-agar