Rework after review CR-NEWSPAPER-168.