merge in lmp-mr1-release history after reset to 2bcb0d0c2a12e2c2dde9def4c43daa52ff8f527f