Re #10836 Changed update from instrument function
Re #10836 further test fixing
Re #10836 Further fixing tests
Re #10836 Proper accessor to descriptors