Merge remote-tracking branch 'rxu3/ticket/12222' into develop

* rxu3/ticket/12222:
  [ticket/12222] Replace hardoded comma with translatable separator