FL-1603: Merge sera overlay