Apply views_conditional-2036829-18.patch