MAP-1036: continue working on automations.