Before merge to 5.5.x branch