[#1596] make change compatible with change already on branch 1.2.x / 1.3.x (all vs ALL)