davep/viewer-beta-maint-2647 archive