Some version specific changes for v0.20.4