MFH: r369720

Fix option

Reported by:	mat
MFH: r369723

Readd a removed (by accident) runtime dependency

Reported by:	mat