VOL-36 - EntityRef improvents in core make this even easier