[IMPORT] Merge branch pending/merge_pull_199 into pending/merge_pull_199_internal
[IMPORT] Merge branch pending/merge_pull_199 into pending/merge_pull_199_internal

bloomberg/bde,che2/bde,bloomberg/bde,che2/bde,bloomberg/bde,bloomberg/bde,che2/bde,che2/bde,bloomberg/bde