Michal can you re-do the pull requests when this is accepted upstream? I just saw some small comments though.