Merge branch 'fix/embeded-relationship-in-follows' into 'develop'