I think we need to complete this before releasing 0.11.0. @kzangeli , what do you think about including it in this PR?