more preparation for switch to new configuration/context