merge in lmp-mr1-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16