Handle profile
Handle proxy profile and registration
Merge master