AC-7955 Begin adding node end trigger