Merge pull request #251 from claco/sprint

Merged automatically by jenkins after successful gate test
Merge pull request #252 from claco/sprint

Merged automatically by jenkins after successful gate test