201252 update for full-app build