Merge "dcaegen2/platform - mod/runtimeAPI java11 upgrade Take into account comments...