Test apps for basic bootstrapping
Merge remote-tracking branch 'origin/master'