Merge branch 'develop' into master

# Conflicts:
#	package.json
2 jobs for master in 28 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #17141
build

00:00:15

passed #17142
publish

00:00:13