merge branch AriDEV