Re #6516 Make sure output data is saved properly
Re #6516 Get rid of API v1 code
Re #6516 minor tweaks
Re #6516 ghost conflict