Merge branch 'staging' into 610-adapt-to-new-keyword-source

# Conflicts:
#	src/app/services/util/tag-cloud-data.service.ts