Merge pull request #23136 from nmav/tmp-ocserv1.2.4