Sync framework

Signed-off-by: Arief M Utama <arief.utama@gmail.com>
Sync framework

Signed-off-by: Arief M Utama <arief.utama@gmail.com>
Merge conflict