Opensource final refactoring

František Hána requested to merge opensource-final-refactoring into development Jul 25, 2019