COMP: Replaced APPEND file command by REPLACE string command.

ACVD files in build directory still need to be deleted manually once.
COMP: Merge branch 'bug-18261-Fix1'