8178 Lifecycle "master" branch - not to be merged yet.