Merge "Merging MultiValueAlpha with MultiPropertyFactory" into tm-qpr-dev