Sync with kaqaz changes