From 122e297a322c13a0e20e2d7e08d511cb79d29c5a Mon Sep 17 00:00:00 2001
From: Kiro705 <kiro705@gmail.com>
Date: Thu, 30 Jan 2020 13:07:36 -0500
Subject: [PATCH] Commiting latest changes for v3.17