Task/619 merge develop

sure