Well... Thing is that this also affects the production code... So I think this should not be merged