edit for mb-9496,admin tasks 2.0+