merge in lmp-mr1-release history after reset to 7aa0c47e4205c6fca136c38f272d911c25c8a8fa