profile changes
Manual merge
Manual merge for sidebar partial