Merged #79 "Add startup/shutdown lifecycle extension point"