Merge branch 'rc/close-range'