Merge "Fix test 421-large-frame."