merged from ba/apply_active_admin