[NGRINDER-699] Keep the backward compatibility