Merge "Reevaluate constraints on run command." into rvc-dev