Merge branch '7658_exchange_popup' into 7740_dynamic_registration_and_authorization
almost dynamic ready
Merge branch 'develop' into 7740_dynamic_registration_and_authorization
hell registration complete