forgot to check in two of the lifecycle events
Merge branch '240_lifecycle_events'