3.4

Address thread safety issues discussed in JGRP-1893