Supporting parent relationship for Tier.
Merge remote-tracking branch 'upstream2/master'