Merge branch 'release-1.2' into develop
rename field holding_id in v_holdings
Merge branch 'release-1.3'