Merge fixes done in master branch.