Merge "Moving fallback check code to Settings"