upstream 7.6.1
7.6.1  craftinc-changes incorporated