Merge for professional and partner views

Coming from kc