Fully-sync with CAF kk_3.5: phase 20

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