[Issue 6761] contrib usn overlay broken