Merge "Remove incorrect/confusing Certificate use" into main