Merge "Fix resource imits for nbi"