Merge "version 4.0.6 Add E2SM files"