for latest RC 2.0 devel