Merge pull request #1843 from DavidPu/xlat_tables_v2_non_recursion