Closes #732 (cherry picked from commit 2fd0495c43) Co-authored-by: Byoungchan Lee <daniel.l@hpcnt.com>
2fd0495c43