DEV-STOP-FIX-1537