Store type merge ci fix#287

spbsoluble merged 8 commits intorelease-1.8Keyfactor/kfutil:release-1.8from

store_type_merge_ci_fixKeyfactor/kfutil:store_type_merge_ci_fixCopy head branch name to clipboard