Add changes in 3.0.17 stable.