support 1.0.14RC1 changes