Merge branch 'release_2_2' into staging

# Conflicts:
#	package-lock.json
#	package.json
3 jobs for staging in 2 minutes and 55 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #321373
install_dependencies

00:01:07

 
  Test
passed #321375
run_linter

00:00:59

passed #321374
run_tests

00:00:48