WHT-31 - Pull request to merge to master