backport for 7.4