Merge current master into two-array tree code