Added by CSE in 0.7.0