Merge branch 'rh/dioread-nolock-1k' into dev