Merge "[fix][core] regex parsing for si ff"