Resolve mac warning.
Merge topic 'use-generator-target' into next

eaa37393 Resolve mac warning.