Merge remote-tracking branch 'origin/feature/holdings-rest' into feature/holdings-rest
* Prevent error on undefined target attribute