merge from amida-tech