NIBG-1272 review comments