Merge remote-tracking branch 'om/master'
revert merge from pli of this 2 files due to error of hw_cfg
Merge remote-tracking branch