Added support for view creators in addition to composers.
Merge branch '4.0'
Fix typo in variable.
Merge branch '4.0'