#511: take over resource changes from #508