misc: merge bagyusz changes