Merge "Fix ill-formed certificate request" into sc-dev