implement the feature request described in mantis 3767 note 15349 (1.
and 2.)