Merge "Fix profile filtered loading"