Enable error display
Merge branch 'enable-display-log' into next

Merge enable error display
Correct IBM comment