[DG,JZ]{issue} S7 - usability improvements