catch up with changes from LifeCycle branch