RF-13581, RF-13582: remove iteration/toggle from framework, revert core re-factoring