Merge "Move smart actions support code." into 24D1-dev