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