Fix possible bug around app selection
Merge branch 'master' into evaluation