Feature/beta 318 319 312 314