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

arlac77 merged 2 commits intomasterKronos-Integration/interceptor-message-handler:masterfrom

template-sync/template-arlac77-githubKronos-Integration/interceptor-message-handler:template-sync/template-arlac77-githubCopy head branch name to clipboard