Merge "Option for disabling ODP" into main