Merge branch 'iliya.saroukha-master-patch-83858' into 'master'

corrected error: passing to position() function whole element instead of key

See merge request !25