Merge branch 'dev'
remove redundant and erroneous normalize overwrite
use indirect eval