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