refactoring: rename ERBase -> Connected
Merge remote-tracking branch 'origin/1.30' into 1.3.0
Merge branch '1.3.0_copy' into 1.3.0
demo-storage updates for 1.3.0