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

arlac77 merged 2 commits into

masterKronos-Integration/endpoint:masterfrom

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