Merge branch 'extra-holdings' into merge