Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-cluster-application-section