Please review branch feature/ZEN-6867_zsnmp