Merge remote-tracking branch 'peter/patch-1' into feature/static-engage-ny-vocab