Updates from S4-KK

Signed-off-by: Alvin Francis <nivlafx@gmail.com>