Merge "Implement uninstall behaviour for archiving" into main