Incorporate Ke's refit fix into overlay branch

Merge request reports

Loading