support 1.0.12RC1 changes