Merge "revise_chip_refresh"