Bringing in fix from cvl-fabric-launcher.