Merge branch 'fix/conversations-rendering' into 'develop'