merge in lmp-mr1-release history after reset to a11b959f9fe7476b4da95fbaf34105e33cfeb0d6