Merge "Fix buffer overflow in syren utility"