merge in lmp-mr1-release history after reset to 899891ec95c0581d35f47db7bdea75bd49fdca1b