Feature 10908: NBI Revisions