CORE-4730: Small change to support belphegor upgrade