preparing for merging with Yury's patches
Merge branch 'master' of https://github.com/ailabitmo/rm-lod