One PR containing #322, #323, #324, #325
Created by: marcus-oscarsson
Dear all,
Since we have done alot of changes lately, we thought that it would perhaps be easier to follow the development and merge if there was one PR containing all the changes. They previous PRs #322, #323, #324, #325 all basically build on each other and it would in the end be rather pointless
to not consider them as one. The exact details can be found in the previous PRs, (Ill close them for now).
So here you go, we hope it makes the merge job a bit easier :).
Cheers, Marcus