Merge "FP2-1680: optimize the log" into fp2-dev-v2