Decouple input and editor container construct event
Merge branch 'master' into gh-pages