Merge "Upgrade oparent version to 1.2.3"