Lets merge that PR first so that this PR can be cleaned up.