merge from template-sync/template-arlac77-github#4715

arlac77 merged 2 commits intomasterKronos-Integration/cluster-node:masterfrom

template-sync/template-arlac77-githubKronos-Integration/cluster-node:template-sync/template-arlac77-githubCopy head branch name to clipboard