Merge "Improvements of Certs creation scripts"