Please mark as CLOSED The errors have been fixed on mainline since 5.7 (4ab25ac8b2b5514151d5f91cf9514df08dd26938) and are also present in 5.4 (276224b7a1477a5ade09c147c984763c2548cf77)
meaning to say the fixes are also present in 5.4.