LAC-9: add functionality. Old dao is used
Merge remote-tracking branch 'origin/master'
LAC-53 bug fixed