Merge remote-tracking branch 'origin/2-10' into 2-10

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