merge in master-release history after reset to 14136039b752376240698e8b422c76de01488bc5