[BUG #8618] prettified code