Merge branch 'develop' into develop-mk-unilib
Fix Debian make
Merge branch 'develop-mk-unilib' into develop-requests