Merge "Fixed accidential override of `sfc_encap`"