NIBG-1429: applying review comments