LB-1259: Merge master branch to devel branch

fixed chain issue.