Merge branch 'develop' into enhancement/replaces-swagger-ui-react

# Conflicts:
#	package-lock.json
#	package.json

Author: simonbs