Update cluster sampes to use actorSelection, see #3074