Merge "Handle multi-prefixes in Reply message properly." into main