Merge "Fix problem passing null optional operands." into oc-mr1-dev