nms-7

Results 1 comments of nms-7

created new `oracle-v2-dev` branch for this to be merged into as these changes won't be deployed immediately