Merge of Master branch to Develop branch with fixes

Files removed in master were restored in develop branch after merge to fix build and run.