[minor] changes to make new app friendly
[minor] [merge]