Additional changes linked to NODB option