Updates and Hotseat performance + merge cm 10.1