updates requested by anand:  combine apps, brighten up scenarios, remove feature ids