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

arlac77 merged 2 commits into

masterKronos-Integration/interceptor-decode-json:masterfrom

template-sync/template-arlac77-githubKronos-Integration/interceptor-decode-json:template-sync/template-arlac77-githubCopy head branch name to clipboard