Merge branch 'holdings' into merge