Matthew: merged as-is to unblock you, but the options should be more user-friendly, let's fix it in next patches.
Matthew: merged as-is to unblock you, but the options should be more user-friendly, let's fix it in next patches.