Additions from 0.42.0