Correct change detection in related entity
Some annotations repaired
Merge branch 'bugFix'