Update 4.1.8 with Drawer code reverted