Merge remote-tracking branch 'origin/case-2069' into develop

* origin/case-2069:
  case 2069 - Virtual field instead of blackhole.