Set of changes to get forced reloading working again