Issue #3084233 by salvis: Update 8101 (#3002918) can fail; fix rid width and redo the update in 8102.