Merge remote-tracking branch 'origin/develop' into feature/add-api-support

# Conflicts:
#	package-lock.json

Author: tkskto