2.2/nav ob clean fix. Fixes #2921 and Fixes #2964

Fix this issue with the latest version of 2.2/develop.