add log
Merge remote-tracking branch 'origin/i40' into i20