Merge "explicit set an "optional" tag"