Merge branch 'sg/complete-refs'