Update History log
Bring latest History from 2-6-stable and 2-5-stable