Merge branch 'sg/complete-symmetric-diff' into next