Merge branch 'mr-docs' into 'main'

docs: Add CONTRIBUTING note about conflicting/overlapping work

See merge request !3934