fixed: MB-9788, MB-9496, and MB-10211