Merge branch 'njsf-cov' into for-steve