Horse: Master plan        #16022