Feature/v1.2