Fix doc bug 4598 while backporting some things from wix4.