[CRA-283],[CRA-285] Fix unintended changes.
[CRA-283],[CRA-285] Fixing VS project files.