DEV-STOP-FIX-7820