This commit is a follow-up to d8a20f19 and provides additional K1 compatibility. #KT-59550 Fixed
d8a20f19