Re: #1677 - use token instead of app id