Merge "Modify temp folder for certs"