Maybe would be better we wait for the fix of INTLY-2810 in order to be sure of this change here.