Added both Artix and Kintx support and ported to 2013.4