Merge "Fix passion build"