One 5.12 link fix and 5.13 crossbar support. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit e1b4fd52a8)
e1b4fd52a8