The merge in 7740886ff9ebf74d0365c9d69eb9b46c2876b077 accidentally overwrote changes that were important. This commit tries to restore them while also keeping the additions from feature_updateAll.