Sync with cazfi S2_5 branch.