Merge "Fix mistake in conditional + test" into oc-dr1-dev