Merge branch 'js/apply-recount-allow-noop'