- do not forget to add into mapping dispatch receiver - fix KT-40686 (at least part of it) - add test