Merge "LifeCycle conductor changes"