Fixed bugs in hasHoldings().
Merge branch 'release-2.3'