PIM-3244 : backward compatibility