Enable back the 0.20 in this branch