[Bug 1783301] New: branch for epl-8