Merge pull request #505 from claco/sprint

Merged automatically by jenkins after successful gate test