please backport 833eacc7b5913da9896bacd30db7d490aa777868 to stable