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