Inherit patch
Inherit patch fix
merging et-test.js