Copy paste rdefs 10673 develop

This is in dev_4_4 as https://github.com/openmicroscopy/openmicroscopy/pull/1036, now for develop...