Task/619 merge develop

I have changed this during the conflict resolution. I'm afraid I solved in the wrong direction. Could you rollback it, pls?