Merge branch 'master' into njsf-cov