RF-13860: fix method signatures