Merge branch 'for-steve' into njsf-cov