Merge "Add support and test for P210 format" into main