update hotfix to merge to testing and develop branches