Fusing commits to be ported: b38d6443, 646c0f2c, 75e1d17a, 210a56b6, + several others (but excluding cb3eec56 which has already been merged with special tau spin corrs above), 58311f42, d3a7483a