merge in master-release history after reset to 3c1c730f206d1d2dc25ac555d48513d6a3e5fb7f