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