Updates to terracotta 4.1.x