Merge branch 'develop' into 'dev-boileau'

# Conflicts:
#   follow_transfer.py
2 jobs for dev-boileau in 9 seconds (queued for 2 seconds)