Merge branch 'ps/connectivity-optim'