Merge branch 'fix/1658-invite-send' into 'develop'