revert merge from pli of this 2 files due to error of hw_cfg