Merge branch 'chore/common/core/debug-additional-tests' into chore/common/core/5488-delete-markers-reliably