I think the Discnumber fix is not confirmed for the next release unfortunatley, we will get it fixed after that.