Comment 22 for bug 1796443

Please note that all commits requested for Disco have already been applied as part of LP: #1836614 ("Disco update: 5.0.18 upstream stable release").