Combat twbs 3.1.x release