with some fixes for sout support
some patches may be pushed in master (and backported to 3.0)