Merge remote-tracking branch 'origin/feat-20231110-b2bv2' into feat-20231110-b2bv2

# Conflicts:
#	db/v2.0/20231114.sql