[ENGINE-6: changes related to api change]
[#ENGINE-6]
[#ENGINE-6]