Applied changes from lts branch.