Backported nasty bug for BLZ random access to xdata branch