[Bug 39487] Make step dependencies more flexible