first commits to fix I-102602, I-102602, I-103046

to fixes I-102602, I-102602, I-103046
upcoming fixes are for I-103127, and I-101434 
not sure if this is correct method to patch since this is first time to commit to this git