* [Platform/Update] Fixed some minor issues that prevented direct upgrades from 4.x versions to 6.8
Merge branch '6.8.1' into stable