shell: port to current Weston master