Merge branch 'master' into 'DEV/Akbar/master-h3-slave'

# Conflicts:
#   src/main/resources/application-dev.properties
#   src/main/resources/application-prod.properties
#   src/main/resources/application.properties