Merged v_1 to develop