Add: big progress in new document view
Merge: master