MODIFY Allow env version selection, apply r7096