Pull "merged annex60" branch in issue27_A60 branch for building solving