merged branch akr and semi-1_2_0