Optional cd zip

Why is this part of this change?
Did you merge with master?