Revert "Revert "Merging changes from origin""

Reverts Babicaa/cs-studio#2