combine the change and delete other branch from pull requests REP-fix-test-still-fails