This includes 5.12 fix and 5.13 improvements. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 7091e31230)
7091e31230