Update/merge 12 into 13

I think this should be merged after !206 (merged) and !200 (merged) It would probably be conflicts after those two are merged or viceversa. I will fix them should it be needed.