RR-2487-Edit