Merge "updates to flex ocp pod"