Project cleanup after merge with experimental branch.
Fixed project configeration.
Project configeration cleanup