This was backported to 4.19 and I clearly expected it to land in 5.4 but it didn't (5.5) so backport it to 5.4 for consistency. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
