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