[fixes #52449765] Use barcode_prfix if available
Merge pull request #768 from JamesGlover/52449765_ensure_s2_barcode_prefixes_used_where_needed

[fixes #52449765] Use barcode_prfix if available