This is a partial of Pradeep's commit. Having made his go stale I have picked off some parts
to reduce the amount still left to merge