Merge remote-tracking branch 'origin/ryzhwcs' into ryzhwcs

# Conflicts:
#	src/main/resources/application.yml