Merge pull request #2905 from castillofrancodamian/ocserv