Updated for NBS-147.