Merge branch 'charfix' into 20864
issue #20864: pass uuids to tables
issue #20864: move that margin number over
issue #20864: some styling
issue #20864: prevent infinite loop
issue #20864: fix history labels
issue #20864: fix currency bug
Merge branch 'master' into 20864c
Merge pull request #665 from shackbarth/20864c

20864c