[copr] master: Merge branch 'bkabrda-workspace' (95f1599)