Property type relationship implemented completed
Merge remote-tracking branch 'origin/master'