Packporting some changes from master. Bumped patch version.