support 1.0.15RC1 changes