Merge evan-new-ui commit to evan-dev