Pull changes for #1158 (always using fallback for control channel when censored or in Get mode)