merge Feature/dev ph2