Fix the merge + existing implementation, add changes not included in cherrypick - move vitals logic inside CommunityEntity instead of creating a new entity specifically for vitals