Pull Dev of AlessandroLazzari branch into master