Merge "Fix values at OC deploy"