Fully-sync with CAF kk_3.5: bring back part of phases 14 & 15

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