Merge topic 'sfc_coexist_fix' into stable/brahmaputra