Merge "Controls - Handle action responses"