Gateway-3437:Fix missed requirements mentioned in Gateway-3437