Merge "Fix profile dependency"