XNAT-2966, XNAT-2964, XNAT-2965, XNAT-2972