:memo: Building and starting takes at least a minute
Put back in commented out code.
Merge remote-tracking branch 'upstream/master'