merge in lmp-mr1-release history after reset to 07dfc73e909810d08aa5b909d71eda3c14d1e237