Task/619 merge develop

Same comment above.