merged CHANGES from last hotfix releases