sync with stable branch for 7.0.0.pre11 build