feat: merge remote-tracking branch 'origin/experiment/square-grid' into feature/linear-dynamic-synthesis