Merge "Fix certX509 has not been initialized." into main