Takeover by @lukasmartinelli
Merged with branch takeover and resolved conflicts
Merge branch 'takeover'