reflect Changes for 0.20 [ci skip]