DEV-STOP-FIX-2142