Merge "Fix RegExp issue for sfc scenario"