Merge "Portal-app auto cert gen"