Mostly related to CORE-379