Merge branch 'labels_recon' into to-push