Merge "Fix handling of null "standalone" value."