Merge 0.20.4 Fixes

Merge fixes from 0.20.4 into 1.x