V6.0.6

  • Partial #579 Optimised one column discriminator, but did not address underlying issue