v1.54 with security improvement