Request to back-port this patch to v5.4 stable tree