Cheryy pick from master for `mate-utils` 1.6

Hi,

These are my re-submitted cherry picks from `master` for `mate-utils` 1.6

Regards, Martin.