Always add FFOC and LFOC markers (#1805).