Fixes U4-4271 U7.1 Nightly build 16 YSOD when editing doc type