#336 - done as a feature toggle, testing pending