Merge "Small clean up to get ready for receive state based triggering." into main