merge edge emph configurability to master branch