merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b19868dfc2ff8