Commiting old multi-train figs before pruning down
Camera-ready version for S+A approval + corrections