SCATTER-257

see if synchronised helps the diode glitches occuring with concurrent access
Merge remote branch 'i22/8.36' into 8.36
Merge branch '8.36'