APP-748 Merge Pull request #1