Merge branch 'rr/maint-t3510-cascade-fix'