merge in lmp-mr1-wfc-release history after reset to lmp-mr1-wfc-dev