(cherry picked from commit 74c3d1dc0de0335f941362c80447871e7d6bc78e) Signed-off-by: Robert Sirchia <rsirchia@outlook.com>