Merge "Treat default value that wasn't found as empty value." into cm-10.2