SOS-1655 The master one needs @Override cause master is for 6.2.x only