Merge "Support more input formats" into main