Merge Sample fixes to master