Merge remote-tracking branch 'upstream/master' into ebataller_Portfol… · rosetta-models/common-domain-model@109ec53