8178 - Lifecycle "master" branch - not for merging yet.