Merge QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>