Changes from master branch and few others