CONN-575:Fixed isStandard() logic for Gateway