This fix 049f8d2cb2b2dfe734a24aadeb209a6b3f8c94f4 brokes our project. Did you tried it before merging? cc @b0rey @tadatuta