Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'