Add changes since 3.0.20 beta