Merge "Add default value to inline payloads" into oc-dr1-dev