Backport !1504 to 10.0.3