Merge remote-tracking branch 'origin/develop-80-porting-to-mn5' into auto-caliope-operational-run

# Conflicts:
#	hermesv3_gr/config/settings.py