Context based assembly

Dominic Kempfrequested to merge
feature/context-based-assembly into master

Opening this just to report bugs to @smuething , a proper writeup of the actual feature will follow, I guess.

Merge request reports