Added temporary disabling to ConnectionScope