Merge "fix NPE on NBI serviceInventory"