No review is needed, I will merge soon if tests pass unless someone has any comment, I'm tagging a few people in case they are interested about this change. You can check bd26baa5 and a76c76f4 to see what this is about.
/cc @kirr @lu.xu @tomo
