We already have this function in latest master?