Fix/4.0.x/cross 1358