Merge "Allow >= 8 digits for puk" into main