Conflicts: docs/changelog/7.x.x.txt docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg