Signed-off-by: Kenny Meador <kenny.meador@outlook.com>

(cherry picked from commit 1a0d931a)