Merge pull request #7233 from nupplaphil/bug/installer_replace_macro