persist show advanced
Merge branch 's-hist' into staging2