Merge "Fix inclusion of LF in IntralineLoader" into stable-2.8