Merge "Moving forward to OPR6.170623.012" into oc-gce-dev