(cherry picked from commit d4b3a7e99d) Co-authored-by: Mitch Cairns <mitch.cairns@handheldlegend.com>
d4b3a7e99d