merge in master-release history after reset to 23ec4136eece7ed905991e33cffd507601d48de5