78b6432ced
Without this commit we get some ABI changes and it looks bad. Related to KT-65596
Without this commit we get some ABI changes and it looks bad. Related to KT-65596