Merge "fix(docs): update the v2.6 change-log" into integration