NJ: downloads change
NC: bill fix
Merge remote-tracking branch 'origin/master'