Fully-merge CAF jb_1.9.6: Part 2

Signed-off-by: Sultanxda <sultanxda@gmail.com>