Merge fabianpk dev branch

Fabian Tërnavarequested to merge
fabianpk into master

Merges skills/dev and aron/dev and armem/ltm/dev

Edited by Fabian Tërnava

Merge request reports