merge in lmp-mr1-release history after reset to 1209904b18c507531251acca736b3169a15bc2fa