Merge branch 'develop' into 'B11134_Set_samesite_header_for_cookies'

# Conflicts:
#   extension/Classes/Core/Store/Session.php
1 job for B11134_Set_samesite_header_for_cookies in 2 minutes and 9 seconds (queued for 1 second)