Merging with Valeriy's changes. Merge issues still in project.properties.