Merge "Deprecate esr-gui and esr-server"