This should not be merged before !181 (merged) (I cannot define MR dependencies with my access level)