changes needed for TEZ-1057