Add additional Cherrypicks

Signed-off-by: KainGC <cows_say_potato@yahoo.com>