21628 - Fixes for commissions, applications, merge Travis' branch