Merge branch 'dev' into dev-doc-table-optimization