Fix to contains property method so that it encomapsses the owner chain properly.
Update merge from local master.