[420821] Complete OCL Registry patch 
9 files changed