Copy over a couple more features from essex

Change-Id: Iafc4a0116027249df7f6188dbdacafaf5cfce4d6