Contains all changes from !151 (closed) and !137 (merged) as well as additional tests and some fixes.
Manual Tests