Updated to Thor+ 1.6.x.