DAR-1485 | Drawer changes after CR