Consolidated single commit for defect branch
Merge pull request #1 from burbel/defect

Consolidated single commit for defect branch