merged latest development