Update from master

# Conflicts:
#	package-lock.json
#	package.json
1 job for microservices in 7 minutes and 53 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #36710
code_quality

00:07:53