re #832. re #834 - merging work from these two tickets into one View.