Merge branch 'adasko' of mmka:unres into adasko