merge changes from branch arl