[CB-6024] nopt refactoring