[SUREFIRE-987] and [SUREFIRE-1109]