Merge "Fix installing cross-formula dependencies"