LB-1259: Merge master branch to devel branch

fixed chain issue.
Merge pull request #537 from nistormihai/devel

LB-1259: Merge master branch to devel branch