Reverted the branch merging into the network back to timestamp based as the set insertion wasn't displaying properly.
Merge branch 'master' into stash/3.x