557 files merged. Conflicts resolved: - CHANGELOG.md: took refactor/lazy-loading (session changelog) - versions.ncl: took refactor/lazy-loading (adds typedialog entries)