Properly handling bytes EMD comment.
Merge branch 'master' into replication
Fixing a few details.