Merge branch 'custom_rope' into main