Topic/default/prepare 0.0.7

I'd like to include !85 (merged) in this version so this MR would have to be merged after !85 (merged)