Solution file related changes

pull request for commit 2efaaa1  and b4f9b9f