[Matahari] [PATCH] - Connection fallbacks