PR160 merge
Created by: bwbohl
Merging #160 requires merging develop into the pr first in order to avoid reintroduction of some RWA specifics
Created by: bwbohl
Merging #160 requires merging develop into the pr first in order to avoid reintroduction of some RWA specifics