Merge branch 'rds-packet-assembly-fixes'