HOT-FIX SCHEDULED FOR 21-JUN-2018