Merge "Revert "OC-DR is 8.0.1""