Revert "Merge branch 'adasko' into devel"