FS-4622 --resolve
FS-5034 --resolve please document accordingly on the wiki
FS-5319 --resolve
FS-5299 --resolve
FS-5249: --resolve add message sort ordering.
FS-5318 --resolve