Update changes for v2.6.1