Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize().