Merge branch 'dev' into 'm2-microservice-communication'

# Conflicts:
#   winery/harvest-management/src/main/java/org/delta/winery/harvestwine/service/HarvestManagementServiceImpl.java