#4437 is now merged.