Intermediate checkin; lifecycle states in place.
Merge remote-tracking branch 'origin/master'