merge with 1.42.0; updated changelog