* Try to fix #729700 and #729702
* Try to fix #730765