Sync'ing with new app catalog models.
Merge remote-tracking branch 'origin/master'