Added note in https://work4labs.atlassian.net/browse/OPS-1885 so we come back at it