- This commit finishes feature parity with master
- except thumbnails