Merge branch 'main' into 2064-remove-contacts