Tested with 3.8.1.
Adjust "Match Time" 0 handling and messaging.