New nb cpu computing mode; Reported fixes from other patches
Merge branch 'patch-cpu/5.1.1' into release/5.1.1