JR676 updated changes made for https://tracker.nci.nih.gov/browse/CURATNTOOL-631
JR746
Tagged JR676/JR631/GF30681/JR746