CSCun55530 & upgrade charm fix