Pull request from Master to Sama

Pulling changes made from master into Sama branch - April 8th