#944 Add support on v1.0.