Merge "Move smart actions support code." into main