lifecycle: address comments on fc98bb4e179f1fa0251f2b975af49f972c734b81