fixes #1615
adds a new settings and keeps the DB small for reversions
missing publish limit test
fixed some bugs and docs
ojii changes
optimize some queries
Merge remote-tracking branch 'origin/pr/1687' into develop