Fix archini and wapiti error detail are swapped
Merge branch 'Thanh'