OPAL-1577 - added certificate support