Added support for local .server file
Merged upstream