0023136: Increase visibility of DRAW samples