Merge "of/base: Take NULL string into account for property with multiple strings" into msm-3.0