Merge development in ovgu-ttz:dev