*8707* Fixed modal overlay issues