Signed-off-by: Kenny Meador <kenny.meador@outlook.com>
(cherry picked from commit 145fd1c2)