Dev merge arty branch