Notes: 1st commit for v2.6.14