969759: committed sample level issues reported from dev team.

969759: committed sample level issues reported from dev team. #2