Fix whitespace.
Merge topic 'target-SOURCES-refactor' into next

716fd967 Fix whitespace.
Attempt VS70 fix.
Merge topic 'target-SOURCES-refactor' into next

e0d3716e Attempt VS70 fix.