Added backward compatibility to the launcher script
Merge remote-tracking branch 'origin/feature/ap-launcherscript-refactor' into feature/ap-launcherscript-refactor