3a1a5fe12b
* Collapse unsupported previous version entries
* drop the last entry in the matrix test
(cherry picked from commit f57950a3c9)