TDLR-440
Merge remote-tracking branch 'origin/master'
TDL-427 fulltext search issue