Changes on main branch files while I was working on dynamic phrase tables.