Merge "Fix issue with certificates conversion"