Air Gap solution [RTFACT-17283]