// TODO this directory should be removed over time - remnant of thread_safe merge