Changes due to 4.2.2
Signed-off-by: iceandfire <arhamjamal@gmail.com>