Merge release 2.6.2