Task/619 merge develop

Fixed in bf9d2f6