Made essence work. Merge remote-tracking upstream/master.