#334 migration to MQ